From fc785ea273b2494e277be9069236685af149b0b3 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sat, 3 Jun 2017 11:03:12 -0700
Subject: [PATCH] Type alias `activations` to consolidate definition

Avoids duplicating tons of maps!
---
 src/cargo/core/resolver/mod.rs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/cargo/core/resolver/mod.rs b/src/cargo/core/resolver/mod.rs
index 6ea55115c..00b3cdcda 100644
--- a/src/cargo/core/resolver/mod.rs
+++ b/src/cargo/core/resolver/mod.rs
@@ -297,13 +297,15 @@ enum GraphNode {
 
 #[derive(Clone)]
 struct Context<'a> {
-    activations: HashMap<String, HashMap<SourceId, Vec<Summary>>>,
+    activations: Activations,
     resolve_graph: RcList<GraphNode>,
     resolve_features: HashMap<PackageId, HashSet<String>>,
     resolve_replacements: RcList<(PackageId, PackageId)>,
     replacements: &'a [(PackageIdSpec, Dependency)],
 }
 
+type Activations = HashMap<String, HashMap<SourceId, Vec<Summary>>>;
+
 /// Builds the list of all packages required to build the first argument.
 pub fn resolve(summaries: &[(Summary, Method)],
                replacements: &[(PackageIdSpec, Dependency)],
@@ -1115,8 +1117,7 @@ impl<'a> Context<'a> {
     }
 }
 
-fn check_cycles(resolve: &Resolve,
-                activations: &HashMap<String, HashMap<SourceId, Vec<Summary>>>)
+fn check_cycles(resolve: &Resolve, activations: &Activations)
                 -> CargoResult<()> {
     let summaries: HashMap<&PackageId, &Summary> = activations.values()
         .flat_map(|v| v.values())
-- 
2.30.2